merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Mon, 9 Apr 2007 19:40:25 +0000 (13:40 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Mon, 9 Apr 2007 19:40:25 +0000 (13:40 -0600)
commitb43b64a63d3647c069b583e4f47211e8fde82f1c
tree073de416fd7aa12f0deb80b0cb763d3beec2a811
parent6da461333694958d11ec529486307522633ce289
parent1bb4ad8e20a326bec0c845149980211d1f69869e
merge with xen-unstable.hg